updated for apache 2.4 (mavericks)