[Bf-blender-cvs] [1880cb6] id-remap: Merge branch 'master' into id-remap

[Campbell Barton]

Commit: 1880cb6c7503f22540b018287eb0de23efabae1f
Author: Campbell Barton
Date:   Thu Jun 16 20:03:53 2016 +1000
Branches: id-remap
https://developer.blender.org/rB1880cb6c7503f22540b018287eb0de23efabae1f

Merge branch 'master' into id-remap

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



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