Merge branch 'da/downcase-u-in-usage' into maint