Merge remote-tracking branch 'kaspersorensen/METAMODEL-1224-newer-versions-of-postgresql'