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

[Campbell Barton]

Commit: eedcc4a6a08b21b97146ae00328214987460a223
Author: Campbell Barton
Date:   Wed Jun 15 17:29:11 2016 +1000
Branches: blender2.8
https://developer.blender.org/rBeedcc4a6a08b21b97146ae00328214987460a223

Merge branch 'master' into blender2.8

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



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