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

[Bastien Montagne]

Commit: 8bbfd2729a286547412f71ced8777e43b2fc1f50
Author: Bastien Montagne
Date:   Mon Dec 7 17:45:41 2015 +0100
Branches: id-remap
https://developer.blender.org/rB8bbfd2729a286547412f71ced8777e43b2fc1f50

Merge branch 'master' into id-remap

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



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