Fixes for select box on Convert page.
Merge branch 'master' into development