v2.12.1: Merge pull request #3214 from tphoney/prep_v2.12.0 ⌘ Read more