#55 fixed. Replaced file that was emptied due to some autofix line ending thingy?
#55 fixed. This file was emptied due to some autofix CL with my changes re-instated
Merge branch 'master' into 2.35rc