upstream/v3.1.3+dfsg1

Ghislain Vaillant

@vaillant-guest

eac9359d · Merge tag 'upstream/v3.1.3' into dfsg-clean · Oct 20, 2015

Upstream version v3.1.3+dfsg1