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