SWC-1178: underscores in div id misinterpreted
Merge pull request #812 from jay-hodgson/SWC-1178

SWC-1178: underscores in div id misinterpreted