please don't merge until somebody has a chance to confirm on each of OSX (since you mentioned it) and Linux and Windows.
This pull does not change the OSX-specific code, that will still work. The Linux code is also used on Windows, so I have tested it and tested the native Windows dialog path too.