Lots of debugging.
Merge branch 'master' of github.com:nprapps/shelf-life