https://github.com/modcluster/mod_cluster/pull/20 cherry-picked to master

Commits [cdd2c5b424dcf371f1828c42279094458def9bf3] and [5ae5beb0aa33457456d5780b45e2a29766420226] cherry-picked to master.