Merge branch 'hotfix/normalizeLineEndings' into Github/fork/master