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

[Campbell Barton]

Commit: c2dc77983dc4d3271858737a15ee058ef48fb833
Author: Campbell Barton
Date:   Thu Jun 23 08:04:19 2016 +1000
Branches: blender2.8
https://developer.blender.org/rBc2dc77983dc4d3271858737a15ee058ef48fb833

Merge branch 'master' into blender2.8

No changes, just resolve conflicts.

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



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