Travis: add --no-ff to merge
To preserve feature branch topology in history [merge]
Merge branch 'travis-merge-no-ff'