Remove unneeded newline
Merge branch 'dev'