Merge pull request #1310 from jmaas/master

Map exclude/include properly to repo lines.