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

[Bastien Montagne]

Commit: bb3d3cc9cfe7987a343eeca463785fa6d60cceb1
Author: Bastien Montagne
Date:   Fri Mar 4 14:25:20 2016 +0100
Branches: id-remap
https://developer.blender.org/rBbb3d3cc9cfe7987a343eeca463785fa6d60cceb1

Merge branch 'master' into id-remap

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



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