Mavericks

I based this PR on the wrong target branch. Closing and re-doing it.