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

[Bastien Montagne]

Commit: dbf7d30744512ac733785ebdf0a163d54a5c8f54
Author: Bastien Montagne
Date:   Thu Jun 16 15:39:54 2016 +0200
Branches: id-remap
https://developer.blender.org/rBdbf7d30744512ac733785ebdf0a163d54a5c8f54

Merge branch 'master' into id-remap

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



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