Role changes.
Merge remote-tracking branch 'remotes/upstream/master'
Tests
Fix for code review comment
Merge pull request #116 from jbzdak/merge_line_2

Ensure line with no escape problems