Merged in changes from upstream/master.
Merge branch 'master' of https://github.com/jpttrssn/peewee