Merge 3.2: ignore commits (already done in 3.3 previously)