Corrected bookmark help
Merge branch 'master' into plugins