Merge branch 'master' into server-update

Conflicts:
	toolkit/components/places/Interests.js
	toolkit/components/places/tests/interests/head_interests.js