Reupload due to Mercurial conflict