[Bf-blender-cvs] [2124f3107c4] master: Merge branch 'blender2.7'

[Campbell Barton]

Commit: 2124f3107c4ed6490a92771f6bd7c452a3c98627
Author: Campbell Barton
Date:   Wed Jan 16 00:28:46 2019 +1100
Branches: master
https://developer.blender.org/rB2124f3107c4ed6490a92771f6bd7c452a3c98627

Merge branch 'blender2.7'

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



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