Merge pull request #3565 from elupus/subsgui