Merge recent changes from trunk.
commitbd1979c486e3a56238d2b469092d8eee696b274c
authorD. Richard Hipp <drh@hwaci.com>
Mon, 4 Jun 2018 13:27:39 +0000 (4 13:27 +0000)
committerD. Richard Hipp <drh@hwaci.com>
Mon, 4 Jun 2018 13:27:39 +0000 (4 13:27 +0000)
tree912581e39c5cd30370a057cd4129428c3e488bf3
parent8e2b113870cd516ca4a1f0ce7484180d2164e9ed
parentc95399cb30e1ef60397d12a1965d2f8a9ccdf200
Merge recent changes from trunk.