Merge branch 'dev'
Normalize line endings
Merge branch 'master' into dev