Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

.travis.yml

@@ -21,6 +21,7 @@ before_script:
   # - go test -race ./...
 script:
   - ./gocoverage.sh
+  - if [ "$COVERALLS_TOKEN" ]; then goveralls -coverprofile=profile.cov -service=travis-ci -repotoken $COVERALLS_TOKEN; fi
 env:
   global:
     - PKG_CONFIG_PATH=/opt/qt54/lib/pkgconfig

gocoverage.sh

@@ -27,6 +27,3 @@ done
 
 $GOROOT/bin/go tool cover -func profile.cov
 
-# To submit the test coverage result to coveralls.io,
-# use goveralls (https://github.com/mattn/goveralls)
-goveralls -coverprofile=profile.cov -service=travis-ci -repotoken $COVERALLS_TOKEN