Fix ping_verify: handle new and old startpage
Merge branch 'master' into develop