Merge branch 'develop'
Fix TravisCI badge links.