[Bf-blender-cvs] [6e12bd6cf22] workspaces: Merge branch 'blender2.8' into workspaces

[Campbell Barton]

Commit: 6e12bd6cf22f8c90af5001ef7b1adc0be4c161f6
Author: Campbell Barton
Date:   Sun Apr 9 16:12:07 2017 +1000
Branches: workspaces
https://developer.blender.org/rB6e12bd6cf22f8c90af5001ef7b1adc0be4c161f6

Merge branch 'blender2.8' into workspaces

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



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