Fix Exception on Linux
Merge remote-tracking branch 'massi/bugfix-linuxseg' into feature-travis