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

[Campbell Barton]

Commit: c96d4ec6446e321dd7566e16f1c7266f9cba5762
Author: Campbell Barton
Date:   Fri Jun 10 05:46:29 2016 +1000
Branches: blender2.8
https://developer.blender.org/rBc96d4ec6446e321dd7566e16f1c7266f9cba5762

Merge branch 'master' into blender2.8

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



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