Merge branch 'master' into java7


Conflicts:
	build.xml

Also removed the warning about Java7 not being able to
build the distribution, which doesn't apply to this branch.

Review by @gkossakowski