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

[Campbell Barton]

Commit: ed6f86a5106e4c8de3fee0ba2ea495f7ac1455c0
Author: Campbell Barton
Date:   Tue Jun 7 18:06:46 2016 +1000
Branches: blender2.8
https://developer.blender.org/rBed6f86a5106e4c8de3fee0ba2ea495f7ac1455c0

Merge branch 'master' into blender2.8

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



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