Merge branch 'ap/remote-hg-unquote-cquote' into maint