Second major commit after line ending normalisation