Merge change 2255

* changes:
  Fix an issue where bookmarking https: sites doesn't work.