This syncs the port with master branch to fix fetch, for upstream does not preserve older distfile versions.