I've actually done this in the `osx-production` branch (for the OS X 10.9 beta stuff), I can merge that into this branch too.