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

[Bastien Montagne]

Commit: efb2d755c116ff9feda84ab6370d211712a90b68
Author: Bastien Montagne
Date:   Fri Sep 11 15:53:37 2015 +0200
Branches: id-remap
https://developer.blender.org/rBefb2d755c116ff9feda84ab6370d211712a90b68

Merge branch 'master' into id-remap

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



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