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

[Bastien Montagne]

Commit: 30b90cbb017590c009044c9ce88fb656761e228a
Author: Bastien Montagne
Date:   Sun Mar 6 14:53:57 2016 +0100
Branches: id-remap
https://developer.blender.org/rB30b90cbb017590c009044c9ce88fb656761e228a

Merge branch 'master' into id-remap

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



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