Fixes Chrome extension and bookmarklet issues
Merge remote-tracking branch 'remotes/github/extAndBookmarkletFixes'