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

[Campbell Barton]

Commit: 5ae6a3b6b6a11d263c1debe957b1345f7c6c250f
Author: Campbell Barton
Date:   Tue Jun 28 21:10:11 2016 +1000
Branches: blender2.8
https://developer.blender.org/rB5ae6a3b6b6a11d263c1debe957b1345f7c6c250f

Merge branch 'master' into blender2.8

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



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