Merging in bookmarklet changes