Merge branch 'master' into ce-tweak-jobs-query

Author: clekstro

.travis.yml

@@ -32,4 +32,4 @@ jobs:
       install: echo skip
       before_script: echo skip
       script: make ship
-      if: type = cron OR commit_message =~ /ship:docker/ OR env(SHIP_DOCKER) = true
+      if: commit_message =~ /ship:docker/ OR env(SHIP_DOCKER) = true