Splash and fades a little better
Merge branch 'master' into splash-fade