Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 18 Dec 2017 15:36:23 +0000 (16:36 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 18 Dec 2017 15:36:23 +0000 (16:36 +0100)

Trivial merge