Fixed bug with apostrophes in diff
Merge branch 'hotfix/diffs'