[[ Bug 11122 ]] Special case '$#' in colorization code so as not to cause a comment to start.
[[ Bug 11122 ]] Added release note.
Merge branch 'bugfix-11122' into release-6.1.1