"Normal" deck
Merge branch 'master' into gh-pages