Merge origin/master

Conflicts:
	scripts/forms.js