Fuck you sprocket
Merge branch 'master' into staging