Merge pull request #3555
060fdb4 Squashed 'src/leveldb/' changes from e991315..9094c7f (Pieter Wuille)