Bug#840378: another stable update

["Adam D. Barratt" <adam@adam-barratt.org.uk>]

Control: forcemerge -1 840856
Control: tags -1 + moreinfo

On Mon, 2016-10-17 at 10:16 +0200, Salvatore Bonaccorso wrote:
> JFTR, I'm perfectly fine if -- in case accepted by the SRM -- my
> proposed debdiff just get squashed in in Mateusz upload, or if he
> want's to do the upload. In fact I have X-Debbug-CC'ed on my first
> request, just in case he would like to take over.

That sounds good, thanks; sorry for the delay in getting back to you
both.

Please could someone prepare and test a package including both fixes,
and send the debdiff to this report.

Regards,

Adam