Applied to trusty, xenial, yakkety and zesty master-next branches. Though, I would expect a patch for trusty only that did not require the -C2 option, and the extra comment should be after the commit message, or sent on a different message. Thanks. Cascardo.