don't unescape HTML in the select list (button text)
Merge branch 'master' into patch-1