Merge branch 'bookmarks' into next. This fixes #103.