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

[Bastien Montagne]

Commit: 3f22fbf32b7e2e38f28de3be4881900e7d791211
Author: Bastien Montagne
Date:   Thu Sep 3 16:16:50 2015 +0200
Branches: id-remap
https://developer.blender.org/rB3f22fbf32b7e2e38f28de3be4881900e7d791211

Merge branch 'master' into id-remap

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



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