Merge tag '2.3.2+dfsg2-6ubuntu1' into rochade