Revert "Merge remote-tracking branch 'upstream/master'"

Conflicts:
	content_handler.js