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

[Campbell Barton]

Commit: f0fda91a5591ebb2161922f35777a32cc374964a
Author: Campbell Barton
Date:   Mon May 21 17:27:38 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf0fda91a5591ebb2161922f35777a32cc374964a

Merge branch 'master' into blender2.8

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



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