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

[Bastien Montagne]

Commit: 8ae125e946bd9b345ae2be17caa448e9c5e5d7b0
Author: Bastien Montagne
Date:   Sat Sep 12 15:40:35 2015 +0200
Branches: id-remap
https://developer.blender.org/rB8ae125e946bd9b345ae2be17caa448e9c5e5d7b0

Merge branch 'master' into id-remap

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



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