Corrected a test error on Linux.
Merge branch 'test_error_on_linux'
Merge branch 'master' into kvlist