Fix issue with includes not working when no matches are found (#1337)

* Fix issue where an includes pattern without matches prevented includes from working

* Add new test to handle includes with no matches