s/ErrorT/ExceptT
Merge remote-tracking branch 'origin/master'