tree cce5707380a1dc6782055c06d9456a2d0df30c3f
parent 8a0a69dcbc2db6c51b2b5b327cf4fbd9c1fda050
parent ff6a765facd65fb9fced817d88eb6f193436dcda
author filmaj <maj.fil@gmail.com> 1493322670 -0700
committer filmaj <maj.fil@gmail.com> 1493322670 -0700

Merge branch 'master' into 1.7.x