Fixed Quiz Plugin
Merge branch 'fixes' into dev