[Qgis-community-team] merging pull request

[matteo]

Hi Otto,
I sent you a few commits in the last days. I don't want to stress you, 
but could you please merge them so I can see if all works?

Thanks

Matteo