Please pull in for 1.5.8

if tested all fine. quick look at wallet.py changes please for sanity works though