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

[Campbell Barton]

Commit: 3eaf77fdd34bd9517b650cabde3574361bdc8d21
Author: Campbell Barton
Date:   Thu Apr 5 16:19:43 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3eaf77fdd34bd9517b650cabde3574361bdc8d21

Merge branch 'master' into blender2.8

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



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