[Bf-blender-cvs] [45ff4a807a2] blender2.8: Merge branch 'master' into blender2.8

[Julian Eisel]

Commit: 45ff4a807a2acee29cb82c04f294ab58348627b6
Author: Julian Eisel
Date:   Thu May 25 00:43:01 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB45ff4a807a2acee29cb82c04f294ab58348627b6

Merge branch 'master' into blender2.8

===================================================================



===================================================================