Changes following Firefox's Places update
Merge pull request #321 from patricksnape/ff-history

Changes following Firefox's Places update