Make user-facing copy a little more understandable
Merge branch 'master' into summer-features