Fix for file parsing bug
Merge branch 'master' into scala-2.11

Conflicts:
	project/project.scala