Escaping values before using innerHTML
Merge branch 'master' into firefox-extension
Bump to version 3.1