Update to 3.21
State Changed From-To: open->closed Committed, thanks. Note to submitter: it makes it easier for us committers if you provide a summary of the changes in the update, so we don't have to go hunting around for it.