Merge remote-tracking branch 'upstream/master' into Log-Improvements

Conflicts:
	gui.js