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

[Campbell Barton]

Commit: 80a983ae5e506850e94f8a9bd410d2b1eca5691f
Author: Campbell Barton
Date:   Fri Jul 13 10:31:30 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB80a983ae5e506850e94f8a9bd410d2b1eca5691f

Merge branch 'master' into blender2.8

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



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