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

[Campbell Barton]

Commit: cfd1b48492e8bd8f747f60f12c3fd624c127b9a3
Author: Campbell Barton
Date:   Tue Dec 19 14:15:19 2017 +1100
Branches: blender2.8
https://developer.blender.org/rBcfd1b48492e8bd8f747f60f12c3fd624c127b9a3

Merge branch 'master' into blender2.8

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



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