[Bf-blender-cvs] [94dc377] id-remap: Merge branch 'master' into id-remap

[Campbell Barton]

Commit: 94dc3770318a5053c970d3cd5cbded0aa5a1180e
Author: Campbell Barton
Date:   Sat Jun 18 00:30:44 2016 +1000
Branches: id-remap
https://developer.blender.org/rB94dc3770318a5053c970d3cd5cbded0aa5a1180e

Merge branch 'master' into id-remap

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



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