Test edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	JavaSE/src/test/java/com/google/gson/TestGson.java