Merge branch 'master' into dev

.travis.yml

@@ -38,4 +38,4 @@ deploy:
   on:
     tag: true
     all_branches: true
-    condition: -n $TRAVIS_TAG  && $TRAVIS_TAG == "v"* && $TRAVIS_GO_VERSION == "stable"
+    condition: -n $TRAVIS_TAG  && $TRAVIS_TAG == "v"* && $TRAVIS_GO_VERSION == "stable" && $TRAVIS_OS == "el"