Use default paths for thrown exceptions
Merge branch 'master' into scala-2.11