Merge branch '3.1.x' into 3.2.x
Merge pull request #4460 from marc1706/ticket/14784 [ticket/14784] missing rewrite for lighttpd