fixed regression on rigged cards
Merge branch 'master' into gh-pages