[Bf-blender-cvs] [0c8265c0a9f] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 0c8265c0a9f104d2a27d6ce5c124198239430d08
Author: Campbell Barton
Date:   Wed Nov 29 14:21:03 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB0c8265c0a9f104d2a27d6ce5c124198239430d08

Merge branch 'master' into blender2.8

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



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