Article 40

Patch works for me, tests come out as expected before and after patch, docs look good. I tweaked a little in 15706.3.diff​ to add @ticket annotations to the tests and remove one whitespace change that seemed accidental.