fix travix make targets
Merge branch 'maint'
Merge branch 'master' into next