Auto merge of #6562 - ehuss:travis-no-master, r=dwijnand

Stop building on master on Travis.

I think #6540 probably should have included this, now that there is a green icon.

Author: bors

.travis.yml

@@ -10,6 +10,7 @@ matrix:
   include:
     - env: TARGET=x86_64-unknown-linux-gnu
            ALT=i686-unknown-linux-gnu
+      if: branch != master OR type = pull_request
 
     - env: TARGET=x86_64-apple-darwin
            ALT=i686-apple-darwin