Fix API compatibility issue
Merge branch 'master' into tests

* master:
  Fix API compatibility issue

Conflicts:
	js/content.js