fix support for data-type=array
Merge branch 'master' into gh-pages