Merge origin/master
Asset updates.