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

[Campbell Barton]

Commit: 0f7c60c57650fb91717667b53df84a3d33e8576e
Author: Campbell Barton
Date:   Fri Dec 14 11:15:24 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB0f7c60c57650fb91717667b53df84a3d33e8576e

Merge branch 'master' into blender2.8

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



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