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

[Campbell Barton]

Commit: bb773acd5f22e97896b62aaf9ba9c4f0e8304320
Author: Campbell Barton
Date:   Fri Jun 9 19:40:47 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBbb773acd5f22e97896b62aaf9ba9c4f0e8304320

Merge branch 'master' into blender2.8

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



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