textfields+ optional fields (blank, null)
Merge branch 'master' of github.com:sodamatt/debian-stuff