Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 15 Dec 2017 16:24:28 +0000 (17:24 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 15 Dec 2017 16:24:28 +0000 (17:24 +0100)

Trivial merge