Bump from upstream to 3.3.2