Merge branch 'master' into hotfix-linebreaksbrs
More linebreaksbrs
Merge branch 'hotfix-linebreaksbrs'