Upgrade to 3.2, ticket #36, ticket #38, ticket #35