Merge pull request #2012 from joelmartinez/mdoc-memberremoval-fix