Merge pull request #3526 from urbalazs/improve-splash