Fix commented out part

Seems that commenting things out within a bulleted list doesn't work.
Merge remote-tracking branch 'upstream/master' into 3.6