Also build travis on master changes
Merge pull request #1266 from timlinux/develop

Also build travis on master changes