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

[Campbell Barton]

Commit: 83c28ff96a5745c7f5713665890211657b45a35f
Author: Campbell Barton
Date:   Sun Jun 18 01:44:04 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB83c28ff96a5745c7f5713665890211657b45a35f

Merge branch 'master' into blender2.8

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



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