underscores allowed in Apache module names
Merged back from dev