Update popit resolver to latest commit
Merge branch 'master' into staging-auto-deployed