apply bookmarks patch
Merge branch 'bookmarks'