Fix #260
Merge branch 'master' of github.com:purescript/purescript into record-updates