Merged RHEL stuff from v0.11.