merge minor stash
Merge branch 'master' of https://github.com/ethereum/ethereumj
TODO adjust