More Boots of Pagos updates. Should be usable (and not abusable) now.
Merge remote-tracking branch 'origin/master'