Fixes #153
Merge branch 'master' of github.com:killbill/killbill