Fix missing subfolder in Asssets remote source urls
Merge branch 'develop'
Merge branch 'master' into develop