crossmatching bug in service provider -- solved
Merge remote-tracking branch 'upstream/master'