GII support for sub-modules - Fixes #871 [skip ci]

See #871