Merge commit '3c29f72cd2c84b6d9f12888b3790d9edfa9e6ab7'

Author: Travis CI

.travis.yml

@@ -45,11 +45,11 @@ jobs:
 
 stages:
  - name: test
- if: branch!=master AND branch!=develop AND branch!=^untagged.*
+ if: NOT (branch IN (develop,master))
  - name: merge (develop --> master)
- if: branch=develop AND type!=pull_request
+ if: branch==develop AND NOT(type==pull_request)
  - name: deploy
- if: branch=master
+ if: branch==master
 
 notifications:
  email: false