Updated changelog for 3.6
Merge remote-tracking branch 'upstream/3.6' into changelog
Merge pull request #1766 from marcosgdf/changelog

changelog