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

[Campbell Barton]

Commit: 2de00f495d6cb802f94711871e92eddc9dc2650f
Author: Campbell Barton
Date:   Wed Apr 25 12:26:26 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB2de00f495d6cb802f94711871e92eddc9dc2650f

Merge branch 'master' into blender2.8

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



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