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

[Campbell Barton]

Commit: 528dc6440bb41e6cbfeea62756ba5ae5debcd27f
Author: Campbell Barton
Date:   Fri Jun 8 22:19:39 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB528dc6440bb41e6cbfeea62756ba5ae5debcd27f

Merge branch 'master' into blender2.8

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



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