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

[Bastien Montagne]

Commit: 61bad3cfe087bdc633da1e4d4998923d83a5375e
Author: Bastien Montagne
Date:   Wed Nov 11 15:06:32 2015 +0100
Branches: id-remap
https://developer.blender.org/rB61bad3cfe087bdc633da1e4d4998923d83a5375e

Merge branch 'master' into id-remap

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



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