Merge remote-tracking branch 'origin/trophy-mard0118' into mac-book-pro

Conflicts:
	properties