JIRA-57 fix a bug where the Excerpt & Tailer were not being set consistently.
Merge remote-tracking branch 'origin/master'