Merge branch 'maint-0.2.9' into maint-0.3.4

"ours" merge, to avoid taking any changes from PR 772 in 0.3.4.
(We already merged a different fix for 23790 into 0.3.2 and later.)
This commit is contained in:
teor
2019-04-19 11:39:17 +10:00

Diff Content Not Available