Merge remote-tracking branch 'upstream/master'

Conflicts:
js/functions.js
manifest.json