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

[Bastien Montagne]

Commit: d1dd9b62611a44ca836144edd3e9a337290cf644
Author: Bastien Montagne
Date:   Thu Feb 25 14:42:55 2016 +0100
Branches: id-remap
https://developer.blender.org/rBd1dd9b62611a44ca836144edd3e9a337290cf644

Merge branch 'master' into id-remap

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



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