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

[Bastien Montagne]

Commit: 67cc51d32defdc66b0b439a1a40fa2da461f2d50
Author: Bastien Montagne
Date:   Mon Dec 7 11:01:09 2015 +0100
Branches: id-remap
https://developer.blender.org/rB67cc51d32defdc66b0b439a1a40fa2da461f2d50

Merge branch 'master' into id-remap

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



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