Don't rewrite assets
Merge branch 'master' into develop
Revert abinrax changes
Revert more erroneous merge problems