Merge branch 'da/rhel7-lacks-uncompress2-and-c99'