bugfix: data-order attribute not saved in state
Merge branch 'master' into gh-pages