Changes from John for Mountain Lion

Signed-off-by: Mark Histed <mhisted@gmail.com>
Merge branch 'refs/heads/wip/MountainLion'