begin work on restoring comment expansion
fix comment expansion
Merge branch 'expandcomment'