master and develop for cpp-ethereum