Fix incorrect asset path
Merge branch 'master' into dao_exceptions