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

[Bastien Montagne]

Commit: 28382bad00dd87a6152ff223baeba7740b8e0382
Author: Bastien Montagne
Date:   Sat Apr 9 15:41:46 2016 +0200
Branches: id-remap
https://developer.blender.org/rB28382bad00dd87a6152ff223baeba7740b8e0382

Merge branch 'master' into id-remap

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



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