Store null instead of 0 if no expiry date is specified
Merge branch 'master' of https://github.com/corydoras/Base