Fixed incorrect .match signature after migration.
Merge remote-tracking branch 'Optec/pilot' into pilot

* Optec/pilot:
  Fixed incorrect .match signature after migration.
Merge branch 'pilot' of github.com:GPII/universal into pilot