Fix a string
Merge pull request #1050 from fxkr/fix-typo

Fix a string
add failing test cases from #1038
Merge pull request #1054 from bronze1man/pr-test4

add failing test cases from #1038
Properly handle conversions to non typename types.

Closes #1060
Merge remote-tracking branch 'origin/master'

* origin/master:
  add failing test cases from #1038
Properly treat `error` as an interface type.

Closes #1057