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

[Bastien Montagne]

Commit: e74ce5bd865b07463954326e2244b5ac6b81b620
Author: Bastien Montagne
Date:   Wed Nov 11 19:53:14 2015 +0100
Branches: id-remap
https://developer.blender.org/rBe74ce5bd865b07463954326e2244b5ac6b81b620

Merge branch 'master' into id-remap

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



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