Un-footnote-ify platforms now supported in 3.6.1.
s/3.6.0/3.6 where appropriate.

(cherry picked from commit 33e069af70a89361cdb2249cf2dc8124d0e293c3)