Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 11 May 2017 14:47:21 +0000 (16:47 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 11 May 2017 14:47:21 +0000 (16:47 +0200)

Trivial merge