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

[Bastien Montagne]

Commit: 9ddc60bc10c64ae8b36ab39dbe813e21df5960dc
Author: Bastien Montagne
Date:   Tue Nov 10 16:21:37 2015 +0100
Branches: id-remap
https://developer.blender.org/rB9ddc60bc10c64ae8b36ab39dbe813e21df5960dc

Merge branch 'master' into id-remap

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



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