+ user-supplied match-id assignment seems to be working
Authored by: mukau 2014-12-02
Parent: [r338]
Child: [r340]