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

[Campbell Barton]

Commit: bb4c16ef94470fb3a9678235926577e8e7f042d0
Author: Campbell Barton
Date:   Tue Oct 17 15:18:12 2017 +1100
Branches: blender2.8
https://developer.blender.org/rBbb4c16ef94470fb3a9678235926577e8e7f042d0

Merge branch 'master' into blender2.8

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



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