Added support for h2 and h3 in multichoice-questions
Merge branch 'master' into api-1.1