Changed macros from blackbox to whitebox
Fixed paths in error messages
Merge branch 'master' into scala-2.11