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

[Bastien Montagne]

Commit: e43d70a60fdcf04d60b01a42c0e3984ad35eed8d
Author: Bastien Montagne
Date:   Sun Nov 8 17:59:08 2015 +0100
Branches: id-remap
https://developer.blender.org/rBe43d70a60fdcf04d60b01a42c0e3984ad35eed8d

Merge branch 'master' into id-remap

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



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