Merge remote-tracking branch 'origin/master'

Conflicts:
	export-cli-jar/dota2stats.jar