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

[Campbell Barton]

Commit: 7d7c5135d7b2f811229631e263cf22b300d95806
Author: Campbell Barton
Date:   Fri May 26 23:32:42 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB7d7c5135d7b2f811229631e263cf22b300d95806

Merge branch 'master' into blender2.8

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



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