CRM-12023 one option for regions
Merge branch 'master' of github.com:eileenmcnaughton/civicrm-core