Fixed travis build for Mac
Merge remote-tracking branch 'devel/fix_travis_build_devel' into devel-master