Merge doc fixup from 3.5 into 3.6