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

[Campbell Barton]

Commit: 5940ea11ce89ce16db1cfa956b80efcfddc2e2c8
Author: Campbell Barton
Date:   Fri Sep 7 11:27:18 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB5940ea11ce89ce16db1cfa956b80efcfddc2e2c8

Merge branch 'master' into blender2.8

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



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