GH-229 - Partially fix asset order issue on client-side
Merge pull request #230 from richard-to/GH-229

GH-229 - Partially fix asset order issue on client-side
Merge branch 'master' into GH-89
Make unit tests pass again.