rewrite strverscmp because the old one was broken
Merge remote-tracking branch upstream/$:{upbranch}