upstream/v3.2.0+dfsg1

Ghislain Vaillant

@vaillant-guest

62696f13 · Merge tag 'upstream/v3.2.0' into dfsg-clean · Nov 16, 2015

Upstream version v3.2.0+dfsg1