Fixing issue with filtering line breaks in portcullis
Merge branch 'develop'