[Bf-blender-cvs] [69c8f0cc3b3] master: Merge branch 'blender2.7'

[Campbell Barton]

Commit: 69c8f0cc3b31301adc2a301f05e5bdb2c5916d08
Author: Campbell Barton
Date:   Thu Jan 10 08:10:50 2019 +1100
Branches: master
https://developer.blender.org/rB69c8f0cc3b31301adc2a301f05e5bdb2c5916d08

Merge branch 'blender2.7'

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



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