Merge branch '201202_guiaddsuffix' of https://github.com/laanwj/bitcoin