Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 21 Dec 2017 11:17:48 +0000 (12:17 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 21 Dec 2017 11:17:48 +0000 (12:17 +0100)

Trivial merge