Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 29 Nov 2017 13:59:48 +0000 (14:59 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 29 Nov 2017 13:59:48 +0000 (14:59 +0100)

Trivial merge