[Bf-blender-cvs] [2530ae6c744] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 2530ae6c744ee30f0df28bfd46da0427881a01a3
Author: Campbell Barton
Date:   Sun Aug 20 21:16:08 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB2530ae6c744ee30f0df28bfd46da0427881a01a3

Merge branch 'master' into blender2.8

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



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