Fixed overrides for 3.1 and further versions (for being able to use past subversions' overrides)