#escape ( in getChannelMarker
Merge branch 'trunk'