merge with master + line endings fix