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

[Bastien Montagne]

Commit: 0df9a4ae3d1907e0d5a849c7af3c0d5717d5d782
Author: Bastien Montagne
Date:   Thu Sep 17 19:12:01 2015 +0200
Branches: id-remap
https://developer.blender.org/rB0df9a4ae3d1907e0d5a849c7af3c0d5717d5d782

Merge branch 'master' into id-remap

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



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