A more consistent line break
Merge branch 'dev' into ms