Fix bug introduced in [575]: includes weren't being processed inside match templates.
Fix bug introduced in [575]: includes weren't being processed inside match templates.

mitchellrj/genshi,hodgestar/genshi,mitchellrj/genshi,mitchellrj/genshi,hodgestar/genshi,mitchellrj/genshi,hodgestar/genshi,hodgestar/genshi