Format expire_booksales output better
Merge branch 'master' into staging