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

[Bastien Montagne]

Commit: 11d4cbb04c93e421a69c9f8e436d03862e75ff0e
Author: Bastien Montagne
Date:   Wed Nov 11 20:22:02 2015 +0100
Branches: id-remap
https://developer.blender.org/rB11d4cbb04c93e421a69c9f8e436d03862e75ff0e

Merge branch 'master' into id-remap

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



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