Merge all the latest changes from trunk.
commitb7ca4ba91ec655deb095f46053ea81dbe831b8e1
authorD. Richard Hipp <drh@hwaci.com>
Wed, 15 Nov 2017 16:29:02 +0000 (15 16:29 +0000)
committerD. Richard Hipp <drh@hwaci.com>
Wed, 15 Nov 2017 16:29:02 +0000 (15 16:29 +0000)
treeab0d420cf0d3761845e0a94a46d17a463be27a19
parent7fe27f130e32bc7574b97b47b393abcb08629dbb
parent6f0b5eb4c44f4977ea6e955f9df6518e40454f47
Merge all the latest changes from trunk.