manual merge of !38 by @grmpyoldman because of merge conflict
manual merge of !38 by @grmpyoldman because of merge conflict

hannesmannerheim/qvitter,mitchellurgero/Qvitter,netzkombinat/Qvitter,netzkombinat/Qvitter,hannesmannerheim/qvitter,mitchellurgero/Qvitter