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

[Bastien Montagne]

Commit: 46206fd9a5e50008bfb24a802eb1f254a4740456
Author: Bastien Montagne
Date:   Mon Apr 4 14:39:59 2016 +0200
Branches: id-remap
https://developer.blender.org/rB46206fd9a5e50008bfb24a802eb1f254a4740456

Merge branch 'master' into id-remap

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



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