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

[Bastien Montagne]

Commit: 4cf00de7d4b5ede5f6a854101a91230cb05621cd
Author: Bastien Montagne
Date:   Wed Nov 11 16:15:53 2015 +0100
Branches: id-remap
https://developer.blender.org/rB4cf00de7d4b5ede5f6a854101a91230cb05621cd

Merge branch 'master' into id-remap

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



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