Merge 'remote-hg-prerequisites' into HEAD