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