Enable travis for feature branch
Merge branch 'feature'