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

[Campbell Barton]

Commit: f78ba4bcfe8b06645de0913116b3b519eceb1c7e
Author: Campbell Barton
Date:   Mon May 14 09:01:07 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf78ba4bcfe8b06645de0913116b3b519eceb1c7e

Merge branch 'master' into blender2.8

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



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