merged in spree_quiz