[Bf-blender-cvs] [1b34246] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: 1b34246af23b4fcdaf630c28c1804d6504a61f37
Author: Bastien Montagne
Date:   Mon Feb 1 14:04:48 2016 +0100
Branches: id-remap
https://developer.blender.org/rB1b34246af23b4fcdaf630c28c1804d6504a61f37

Merge branch 'master' into id-remap

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



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