.travis.yml updated
Merge branch 'master' into feature/gpg-notification