fix compile issue with missing min() in wallet.cpp
Merge branch 'master' into develop