Merge origin/master

Conflicts:
	public_html/svg-edit/byram.js
Merge origin/master