tree 48e81db2df251a3543e830fa86bf055f365d85b9
parent 689ed8c89a90e41183c1ab2ca6a43b157d72aadc
parent 7898bfff26aec968ec23a46dc05947e070a83c5d
author drh <drh@noemail.net> 1487297235 +0000
committer drh <drh@noemail.net> 1487297235 +0000

Merge fixes from trunk.

FossilOrigin-Name: 662e8ccf7e6cb0c4520f6c572acf10813ce0b20e