Making more magic action helpers always return Arrays.
Merge branch 'master' into version1