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

[Campbell Barton]

Commit: 64dd9a117dfabad1a9372d34e8804e7ec1ad9828
Author: Campbell Barton
Date:   Tue Jul 11 14:21:05 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB64dd9a117dfabad1a9372d34e8804e7ec1ad9828

Merge branch 'master' into blender2.8

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



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