Merge branch 'master' into heroku-edition

* master:
  add error message to bookmarklet when remote script cannot be loaded (most likely because of security policies on https sites)
Merge branch 'heroku-edition'

* heroku-edition: