- rel 3; important fixes from git (these will be in 3.2.1)