Merge pull request #1111 from acw1251/help_summary_fixes