Vendor compiled assets
Merge with master