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

[Bastien Montagne]

Commit: 9437647f5d9542335d57d95d14948786506271f2
Author: Bastien Montagne
Date:   Tue Apr 12 12:21:00 2016 +0200
Branches: id-remap
https://developer.blender.org/rB9437647f5d9542335d57d95d14948786506271f2

Merge branch 'master' into id-remap

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



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