merge craigcitro/osx