Merge branch 'mh/remote-hg-mode-bits-fix'