Merge branch 'jc/usage-stdin' into maint