~~~ Apache 2.4 updates
Merge branch 'master' of github.com:jakulov/sub2