Fix missing apache dependency
Merge branch 'master' into next