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

[Campbell Barton]

Commit: a15180669891dcb4f0a4dff891e8a129b3788776
Author: Campbell Barton
Date:   Fri Jun 10 05:17:33 2016 +1000
Branches: blender2.8
https://developer.blender.org/rBa15180669891dcb4f0a4dff891e8a129b3788776

Merge branch 'master' into blender2.8

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



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