Merge remote-tracking branch 'origin/master'

Conflicts:
	code/js/ResultsPane.js