Merge origin/master

Conflicts:
	thucydides.properties
Merge origin/master

Conflicts:
	thucydides.properties
Merge origin/master

Conflicts:
	thucydides.properties