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

[Campbell Barton]

Commit: 90ebf4832f8f9745a60300a1f9bad4bab5af52bc
Author: Campbell Barton
Date:   Sat May 6 22:54:28 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB90ebf4832f8f9745a60300a1f9bad4bab5af52bc

Merge branch 'master' into blender2.8

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



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