Added spaces around the string comparison
Merge remote-tracking branch 'origin/fix_travis_build' into devel-master