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

[Bastien Montagne]

Commit: cb770e58ad89fbd896fa931d21d0bbe5fbdc2d47
Author: Bastien Montagne
Date:   Thu Mar 17 12:26:25 2016 +0100
Branches: id-remap
https://developer.blender.org/rBcb770e58ad89fbd896fa931d21d0bbe5fbdc2d47

Merge branch 'master' into id-remap

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



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