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

[Bastien Montagne]

Commit: 12292d441d8ce083853799311ecdd15c52a64b84
Author: Bastien Montagne
Date:   Wed Nov 11 11:49:33 2015 +0100
Branches: id-remap
https://developer.blender.org/rB12292d441d8ce083853799311ecdd15c52a64b84

Merge branch 'master' into id-remap

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



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