[Bf-blender-cvs] [56679ae] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: 56679ae31c5f463d9d0e07592d53a8cef0441ce8
Author: Bastien Montagne
Date:   Fri Dec 4 17:24:43 2015 +0100
Branches: id-remap
https://developer.blender.org/rB56679ae31c5f463d9d0e07592d53a8cef0441ce8

Merge branch 'master' into id-remap

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



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