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

[Bastien Montagne]

Commit: d35d72893e6ba593df0816e0359d515d21daae33
Author: Bastien Montagne
Date:   Wed Nov 25 16:23:22 2015 +0100
Branches: id-remap
https://developer.blender.org/rBd35d72893e6ba593df0816e0359d515d21daae33

Merge branch 'master' into id-remap

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



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