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

[Bastien Montagne]

Commit: c2a5f951226133136301d1959d5e33af332fa012
Author: Bastien Montagne
Date:   Tue Apr 26 14:33:54 2016 +0200
Branches: id-remap
https://developer.blender.org/rBc2a5f951226133136301d1959d5e33af332fa012

Merge branch 'master' into id-remap

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



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