By rblanker: Fixed upgrade path from 3.2 to 3.4.