Update Travis testing to 2.1
Merge branch 'master' into feature/335/more-comprehensive-hide-actions