fix default selection for custom dropdowns
Merge branch 'master' into gh-pages