Travis builds on branches master & develop
Merge branch 'release/branches'