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

[Campbell Barton]

Commit: d5a766a9ed834a72e724aa8bcadb3626619f6ce1
Author: Campbell Barton
Date:   Sat Apr 28 14:49:08 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBd5a766a9ed834a72e724aa8bcadb3626619f6ce1

Merge branch 'master' into blender2.8

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



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