[Bf-blender-cvs] [84c6bca] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: 84c6bcac0d9ddd344ae3b889a855ab64ab98b647
Author: Bastien Montagne
Date:   Thu Oct 8 13:15:29 2015 +0200
Branches: id-remap
https://developer.blender.org/rB84c6bcac0d9ddd344ae3b889a855ab64ab98b647

Merge branch 'master' into id-remap

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



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