Merge origin/master into DifferentApproach

Conflicts:
	AnotherProject/src/anotherproject/AnotherProject.java