Merge pull request #552 from fabrixxm/3.6-rc-it