upgrading to 3.6.2

(cherry picked from commit 70a4ca75f7462f192f92355c0b4c66731a7a1b6a)
attempted doc fix

(cherry picked from commit 85b30a5c719518bd84b5e43ca16f8023d3aa1aef)