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

[Bastien Montagne]

Commit: 53c28a790b54fe1fc02b05819019c4914da3ccec
Author: Bastien Montagne
Date:   Sun Sep 27 11:28:07 2015 +0200
Branches: id-remap
https://developer.blender.org/rB53c28a790b54fe1fc02b05819019c4914da3ccec

Merge branch 'master' into id-remap

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



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