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

[Bastien Montagne]

Commit: 258725cf49799091d8551d490c7c3f88708ecc28
Author: Bastien Montagne
Date:   Tue Sep 15 14:24:44 2015 +0200
Branches: id-remap
https://developer.blender.org/rB258725cf49799091d8551d490c7c3f88708ecc28

Merge branch 'master' into id-remap

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



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