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

[Bastien Montagne]

Commit: f2db96fbaf064270268c0dcb12b398a74e639b07
Author: Bastien Montagne
Date:   Thu Jan 7 10:28:55 2016 +0100
Branches: id-remap
https://developer.blender.org/rBf2db96fbaf064270268c0dcb12b398a74e639b07

Merge branch 'master' into id-remap

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



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