Allow empty arrays to be used
Merge branch 'master' into gh-pages