patch dropdowns for #7118
update versioning to 2.3.2
missed a few 2.3.1's
Merge remote-tracking branch 'upstream/master'