Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 21 Jul 2017 14:08:31 +0000 (16:08 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 21 Jul 2017 14:08:31 +0000 (16:08 +0200)

Trivial merge