COOK-3076, Fix modified
Merge branch 'COOK-3076' of https://github.com/marbe/postgresql into COOK-3076