simple
Merge remote-tracking branch 'origin/master' into zhao

Conflicts:
	src/test/java/foo/AppTest.java
simp