Mac specific lineendings, removed ext
Merge remote-tracking branch 'origin/master'
Mac specific lineendings
Mac specific lineendings, removed ext