Use a new version of popit-resolver with improved name matching
Merge branch 'fix-name-resolution'