Added autocomplete for bookmark options
Merge branch 'master' into plugins