Removed Undefined data type
Merge branch 'master' into scala-2.11
Use defaults for exception paths
Merge branch 'master' into scala-2.11