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

[Campbell Barton]

Commit: bdc3335016ca71b8efd8b61c986d6bbf611a5c46
Author: Campbell Barton
Date:   Mon May 21 12:37:54 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBbdc3335016ca71b8efd8b61c986d6bbf611a5c46

Merge branch 'master' into blender2.8

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



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