Merge PsychtoolboxDownload changes manually