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

[Campbell Barton]

Commit: 21777533fbef067fd680db9b6c6e5e79b823af9d
Author: Campbell Barton
Date:   Mon May 21 12:26:36 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB21777533fbef067fd680db9b6c6e5e79b823af9d

Merge branch 'master' into blender2.8

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



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