merged in changes from https://github.com/y-ken/mod_rpaf