prepare for cpp-ethereum merge of develop into master
prepare for cpp-ethereum merge of develop into master

vaporry/ethereum-buildbot,chfast/ethereum-buildbot,vaporry/ethereum-buildbot,chfast/ethereum-buildbot,chfast/ethereum-buildbot,ethereum/ethereum-buildbot,ethereum/ethereum-buildbot,ethereum/ethereum-buildbot,vaporry/ethereum-buildbot