Fix asset precompile
Merge branch 'master' into staging