Mac fixes
Merge remote-tracking branch 'origin/master'
Upstream update
dl script adds newlines at the end of files