Add LONG_TEST option
Merge branch 'master' into travis.linux