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

[Bastien Montagne]

Commit: 50d2c7f8f4757585309cfa02ba015be5c51da55d
Author: Bastien Montagne
Date:   Wed Mar 23 17:08:26 2016 +0100
Branches: id-remap
https://developer.blender.org/rB50d2c7f8f4757585309cfa02ba015be5c51da55d

Merge branch 'master' into id-remap

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



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