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

[Campbell Barton]

Commit: 58a4c767a14b60b903fbe5c5e7e960c57212faeb
Author: Campbell Barton
Date:   Wed Aug 23 16:10:45 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB58a4c767a14b60b903fbe5c5e7e960c57212faeb

Merge branch 'master' into blender2.8

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



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