Merge branch 'sensible-types' into 'master'