Map popup_fields: maintain sort order as per UI
Merge branch 'master' of git://github.com/flavour/eden