Merge branch 'hotfix/formdateconstraint'
Merge branch 'release/0.59'
Fixed bug with apostrophes in diff
Merge branch 'hotfix/diffs' into develop