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

[Bastien Montagne]

Commit: c9df632175b70e99fc45f84cca84c312486c0bdc
Author: Bastien Montagne
Date:   Thu Nov 12 09:54:20 2015 +0100
Branches: id-remap
https://developer.blender.org/rBc9df632175b70e99fc45f84cca84c312486c0bdc

Merge branch 'master' into id-remap

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



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