Removed bookmark autojoin limit
Merge branch 'master' into plugins