Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 22 Feb 2018 13:27:57 +0000 (14:27 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 22 Feb 2018 13:27:57 +0000 (14:27 +0100)

Trivial merge