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

[Bastien Montagne]

Commit: 2665b3ee83376d38c6d1ae390f140954e2db66d7
Author: Bastien Montagne
Date:   Tue Sep 22 10:01:20 2015 +0200
Branches: id-remap
https://developer.blender.org/rB2665b3ee83376d38c6d1ae390f140954e2db66d7

Merge branch 'master' into id-remap

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



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