Make the Usage statement easier to read.

Backported from 7b9c0e614586d52c5b590a5150b8d5a20de64df8
Merge master