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

[Bastien Montagne]

Commit: 7ce594b54420a5a532d6c6f5a6d60ddc4785b046
Author: Bastien Montagne
Date:   Thu Nov 26 15:04:45 2015 +0100
Branches: id-remap
https://developer.blender.org/rB7ce594b54420a5a532d6c6f5a6d60ddc4785b046

Merge branch 'master' into id-remap

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



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