Final synch (hopefully)

Due to some unexplained phenomena I'm pushing line end changes to the master branch