wallet stuff #408

Merged
wowario merged 2 commits from :wallet into master 3 years ago