upstream/v3.2.2+dfsg1

Ghislain Vaillant

@vaillant-guest

25a2a75a · Merge tag 'upstream/v3.2.2' into dfsg-clean · Jan 04, 2016

Upstream version v3.2.2+dfsg1