Post How to Compile Tomcat mod_jk connector on Mac OS X Mavericks
Merge remote-tracking branch 'origin/master'