tree 6d8637ab6bf57b991594d9171ead7204bf538b7f
parent 8a85dbc8d1201f2c5d92af9e466439a48a073dc1
parent dfec094c16bbab1852766db927d42fab049ca672
author filmaj <maj.fil@gmail.com> 1493310778 -0700
committer filmaj <maj.fil@gmail.com> 1493310778 -0700

Merged master --> 1.2.x branch