Finalize changes for 2.3.1+dfsg-1