Merge #505
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop