Merge pull request #9802 from annando/mod-include