Oops compile error
Merge branch 'master' into type_classes