I bet this will cause a problem with the OS X app bundle, but I can take a look following the merge.