Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 15 Mar 2017 13:19:53 +0000 (14:19 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 15 Mar 2017 13:19:53 +0000 (14:19 +0100)

Trivial merge