Adds mnap branch to Travis CI
Merge branch 'master' into mnap