items: make items an array if it isn't.
Merge branch '_dev/items-type' into dev