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

[Bastien Montagne]

Commit: 7df45b2a49775a5bbf6df8ba9417f5a43a3b6a9a
Author: Bastien Montagne
Date:   Fri Sep 18 16:12:31 2015 +0200
Branches: id-remap
https://developer.blender.org/rB7df45b2a49775a5bbf6df8ba9417f5a43a3b6a9a

Merge branch 'master' into id-remap

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



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