yeah... love in includes
<3
Merge pull request #6379 from ricardoquesada/more_love_in_includes

yeah... love in includes