Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 6 Apr 2017 10:31:26 +0000 (12:31 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 6 Apr 2017 10:31:26 +0000 (12:31 +0200)

Trivial merge