Issue4006: Stop teasing us with user bookmarking
Merge pull request #1881 from LadyOscar/issue_4006

Issue4006: Stop teasing us with user bookmarking