upstream/v3.2.1+dfsg1

Ghislain Vaillant

@vaillant-guest

6072652f · Merge tag 'upstream/v3.2.1' into dfsg-clean · Dec 06, 2015

Upstream version v3.2.1+dfsg1