Add "shuffle" option
Merge branch 'master' into gh-pages