Merge pull request #3258 from TeBoring/3.3.x

Update version number to 3.3.2