Fix special '$' character in the diff view
Merge branch 'master' into develop