Merge remote-tracking branch 'upstream/pr/421' into merge

Conflicts:
	static/compute_server.js