The fix, she cometh.
Merge branch 'master' into ErikBranch

Conflicts:
	main.js