dan ae0151c5a7 Merge version-3.8.7 changes with this branch.
FossilOrigin-Name: d380a6482a46478ebdf97e08b2fcf78b5d126dde
2014-10-20 16:34:03 +00:00
..
2014-05-27 19:18:36 +00:00