Please pull in for 1.5.8

it's tested all fine. quick look at wallet.py changes please though