updated changes
fix typo in changes
Revert "start changes for 3.6"

This reverts commit f78d91994fa65a2aec60879e3c6add60bfe291e8.
Merge branch 'master' into github_master