Make master compatible with the new syntax for overrides