merged 2.3.15dev
fixed line endings
merged 2.3.15dev
mac fixes