Add devel branch to travis configuration
Merge branch 'master' into devel