Merge commit 'f84850b2b79b78cc1df72a6e5c124eab83a143e3'

Conflicts:
	src/testgit/test.java
Merge origin/master
Merge commit 'f84850b2b79b78cc1df72a6e5c124eab83a143e3'

Conflicts:
	src/testgit/test.java