Merge master into java7

Conflicts:
	build.xml
Merge remote-tracking branch 'scala/master' into java7

Conflicts:
	build.xml
Merge pull request #2921 from gkossakowski/fix-java7

Fix java7 branch
Merge remote-tracking branch 'origin/master' into merge/master-to-java7-2

Conflicts:
	test/files/run/t3613.scala
Merge pull request #3011 from retronym/merge/master-to-java7-2

Merge/master to java7 2
Merge branch 'master' into java7

Conflicts:
	build.xml