ensure list, not string. Fixes #431
Merge branch 'dev' into nightly