Merged in latest version of LevelDB (1.13)