Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Add a proper error function and undefined
Remove abort
Merge pull request #145 from CodaFi/error-i-hardly-knew-her

Ex contradictione sequitur quodlibet
merge upstream