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

[Campbell Barton]

Commit: bc347f6015635c4dbb93266f59a214b2050a8c72
Author: Campbell Barton
Date:   Fri Jun 30 13:46:53 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBbc347f6015635c4dbb93266f59a214b2050a8c72

Merge branch 'master' into blender2.8

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



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