Fix string comparison for travis
Merge remote-tracking branch 'devel/update_travis'

Conflicts:
	.travis.yml