Merge pull request #3171 from alexanderkyte/net_4x_mdoc_fixup