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

[Bastien Montagne]

Commit: 18cddb58c48298a2087296a4de5fd5a84a2c8d16
Author: Bastien Montagne
Date:   Thu Sep 17 13:54:36 2015 +0200
Branches: id-remap
https://developer.blender.org/rB18cddb58c48298a2087296a4de5fd5a84a2c8d16

Merge branch 'master' into id-remap

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



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