Merge branch 'master' of https://github.com/cbhaley/calibre
Zero is a valid non-None value for int and float custom columns