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

[Bastien Montagne]

Commit: 3319e460e6cf37d5c474c0d8c65bce7c6293d554
Author: Bastien Montagne
Date:   Sat Nov 28 15:00:57 2015 +0100
Branches: id-remap
https://developer.blender.org/rB3319e460e6cf37d5c474c0d8c65bce7c6293d554

Merge branch 'master' into id-remap

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



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