Merge branch 'issue/3035' into 1.3.x
Fixed welcome screen stickiness
Merge branch 'master' of code.shopp.net:core/shopp