[Bf-blender-cvs] [673c9dce085] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 673c9dce0850f2e6a13570ade132024c34bdb11c
Author: Campbell Barton
Date:   Sat Aug 12 19:08:49 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB673c9dce0850f2e6a13570ade132024c34bdb11c

Merge branch 'master' into blender2.8

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



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