empty_value for choice added
Merge branch 'develop' of github.com:mapbender/fom into develop