Bug 896942 - Fix assets
Merge pull request #11211 from crh0716/896942_master

Bug 896942 - Fix assets r=rexboy