Merge remote-tracking branch 'upstream/master'

Conflicts:
	dest/output.min.js
	src/fillForms.js