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

[Bastien Montagne]

Commit: dd63b849f84ea237d464273083f765281ddb7588
Author: Bastien Montagne
Date:   Mon May 2 14:28:49 2016 +0200
Branches: id-remap
https://developer.blender.org/rBdd63b849f84ea237d464273083f765281ddb7588

Merge branch 'master' into id-remap

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



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