Beware, this commit was not tested. I don't have OS X, but I want to prepare an API change.
Attach a file by drag & drop or click to upload