Merge tag '2.3.2+dfsg3-10' into master