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

[Campbell Barton]

Commit: fb7d23bdb2a5c0ed00067045e4acdf6593258b52
Author: Campbell Barton
Date:   Thu Nov 23 16:28:05 2017 +1100
Branches: blender2.8
https://developer.blender.org/rBfb7d23bdb2a5c0ed00067045e4acdf6593258b52

Merge branch 'master' into blender2.8

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



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