Finally (?) fix annoying bug in Clang 64-bit environments
Fix assert failure on 64-bit systems
Stop using parallel test runs

To avoid false failure due to concurrency
Merge remote-tracking branch 'upstream/master'