Merge maint-0.2.1 with -s ours.