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

[Campbell Barton]

Commit: 9bac172a79d86c0a0c0669272a49809dffa920cd
Author: Campbell Barton
Date:   Fri Dec 14 11:39:39 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB9bac172a79d86c0a0c0669272a49809dffa920cd

Merge branch 'master' into blender2.8

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



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