Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

(This is an "ours" merge of the code for bug1859 backported to 0.2.1.)