Push
Test 7
Merge commit 'fd513cc36b8cc095350552744d4884cdfff0090f'

Conflicts:
	other-project/pom.xml