Version bump from upstream to 3.3.2

Upgrade latest files to 3.3.2 from upstream.  Ran through some tests in my application and didn't run into apparent problems.