Bring in the latest trunk changes.
commit160290b9c355747a09f549193d9023093a57732c
authorD. Richard Hipp <drh@hwaci.com>
Thu, 14 Dec 2017 14:50:49 +0000 (14 14:50 +0000)
committerD. Richard Hipp <drh@hwaci.com>
Thu, 14 Dec 2017 14:50:49 +0000 (14 14:50 +0000)
tree33d9203c502724950c13ad84fe8cee5f12d2e9c0
parentb7ca4ba91ec655deb095f46053ea81dbe831b8e1
parente35a2a270b6f716d47b84b2172fc33ef968b72f6
Bring in the latest trunk changes.