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

[Campbell Barton]

Commit: 2be098a1a02da30617516d32e6cd1409644c005e
Author: Campbell Barton
Date:   Wed Mar 29 20:20:53 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB2be098a1a02da30617516d32e6cd1409644c005e

Merge branch 'master' into blender2.8

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



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