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

[Bastien Montagne]

Commit: fa4d7deac0928ee0a2039656dc9b9869ffb9df33
Author: Bastien Montagne
Date:   Mon Feb 29 15:21:39 2016 +0100
Branches: id-remap
https://developer.blender.org/rBfa4d7deac0928ee0a2039656dc9b9869ffb9df33

Merge branch 'master' into id-remap

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



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