Merge branch 'commands'
Checked in a non-building commit. Oops.