Prevent text from going under buttons.
Merge branch 'master' into api-1.1

Conflicts:
	css/multichoice.css