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

[Bastien Montagne]

Commit: 42dda95e8931c7146837e7f1578bea3c7dbe6599
Author: Bastien Montagne
Date:   Thu Jun 16 18:12:53 2016 +0200
Branches: id-remap
https://developer.blender.org/rB42dda95e8931c7146837e7f1578bea3c7dbe6599

Merge branch 'master' into id-remap

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



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