Merging DebConf changes

Credit for this patch goes to Margarita Manterola. Original patch at:

http://lists.debconf.org/lurker/message/20140904.221307.3c4b2a0c.en.html