Merge pull request #6134 from mikeller/allow_custom_includes