Don't use a smart link's text as form field name (fixes issue #45)
Merge remote-tracking branch 'origin/development' into development