Dummy-merge configure change from 3.2 that is already in default.