Merge branch 'bugfix/br-vs-newline' into 'develop'