commit the change in the branch on Test.java
[hotfix] concat for hotfix
Merge branch 'master' into b1

Conflicts:
	Test.java
.
-a