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

[Bastien Montagne]

Commit: 54307d778da4aa570da46b2abb886c4353953eef
Author: Bastien Montagne
Date:   Sat Apr 16 14:59:16 2016 +0200
Branches: id-remap
https://developer.blender.org/rB54307d778da4aa570da46b2abb886c4353953eef

Merge branch 'master' into id-remap

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



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