Merge branch 'ap/remote-hg-skip-null-bookmarks'