Merge branch 'master' into 1.1.x 1.1.x 81/head
authorfilmaj <maj.fil@gmail.com>
Thu, 27 Apr 2017 19:26:07 +0000 (12:26 -0700)
committerfilmaj <maj.fil@gmail.com>
Thu, 27 Apr 2017 19:26:07 +0000 (12:26 -0700)

Trivial merge