Merge branch 'long-descriptions'

Benjamin Mako Hill || Want to submit a patch?