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

[Campbell Barton]

Commit: c843e848921c2361b69dfaeab9c2984069cb7f3b
Author: Campbell Barton
Date:   Fri Sep 1 02:30:48 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBc843e848921c2361b69dfaeab9c2984069cb7f3b

Merge branch 'master' into blender2.8

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



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