Improved asset canonize to allow for mixed array
Merge branch 'develop' into phpdoc