at-large fix for OS-19
Merge branch 'master' of github.com:sunlightlabs/billy