Merge pull request #2022 from ronie/skin-startup