Backward compatibility with JDK 6
Update .gitignore
Merge branch 'jdk6'

Conflicts:
	.gitignore