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

[Campbell Barton]

Commit: 6a01f62df44cf8d55711ce3a7224f86721547bd5
Author: Campbell Barton
Date:   Thu Sep 20 11:26:31 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB6a01f62df44cf8d55711ce3a7224f86721547bd5

Merge branch 'master' into blender2.8

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



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