updating to 2.3.6 (#2286)

not sure what will go in the release so some change log information is out of date

Author: nagilson