tree 1109790e9892311f7468b313f3aba827b39a27c5
parent b8634afa45dbff16b6bd2babd23311e949ac3b0d
parent 04ce0ea5836400cfaf8298ea3323385591c66c74
author filmaj <maj.fil@gmail.com> 1493320092 -0700
committer filmaj <maj.fil@gmail.com> 1493320092 -0700

Merge master --> 1.2.x