Add support for OS X 10.9
Merge branch 'master' into mavericks

Conflicts:
	src/utils.lua
Merge pull request #1833 from hawkthorne/mavericks

Add support for OS X 10.9