Fix setting autojoin in bookmarks.
Merge branch 'master' into develop