Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 8 May 2017 13:51:17 +0000 (15:51 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 8 May 2017 13:51:17 +0000 (15:51 +0200)

Trivial merge