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

[Campbell Barton]

Commit: 86b7698a3e203a1b9a26c88a0d1acc1cb8b090c6
Author: Campbell Barton
Date:   Thu Jul 13 17:21:11 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB86b7698a3e203a1b9a26c88a0d1acc1cb8b090c6

Merge branch 'master' into blender2.8

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



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