Squashed 'src/leveldb/' changes from 20ca81f..a31c8aa