3e4a2e1bb4
This had to be in another commit as git am did not like a mixture of file updates with Windows and Unix EOL. Should deal with the conflicts that Neil talked about in his comments for the bug :)