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

[Bastien Montagne]

Commit: a6df054b02a1918f42ae79aa30d5eaeace75e8b6
Author: Bastien Montagne
Date:   Tue Nov 24 15:52:04 2015 +0100
Branches: id-remap
https://developer.blender.org/rBa6df054b02a1918f42ae79aa30d5eaeace75e8b6

Merge branch 'master' into id-remap

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



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