Comment 5 for bug 1539882

The attached patches are slightly bit-rotted, however, not so much so that they couldn't be easily salvaged.

I've applied the patches and put the result in branch: LP1539882

I've confirmed that, for at least a circular via, master currently does add the extra, and after the patch is applied, it no longer does.

Unless there are any objections, I'm going to pull this into master for the upcoming release.