mod_custom_redirect: merge of 0f8d234 from master