update the assets needed for the sandbox
Merge branch 'refs/heads/master' into 2.3