Merge remote branch 'origin/test_cleanup' into tvierling
Merge remote branch 'origin/channel_normalization' into tvierling
Merge remote branch 'origin/help_escape_html' into tvierling
Merge remote branch 'origin/who_command' into tvierling