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

[Bastien Montagne]

Commit: 0c161e23d9e071beae8ab18a7c73c4b2eb42879b
Author: Bastien Montagne
Date:   Wed Nov 25 12:48:38 2015 +0100
Branches: id-remap
https://developer.blender.org/rB0c161e23d9e071beae8ab18a7c73c4b2eb42879b

Merge branch 'master' into id-remap

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



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