Missing commit from fedora-20-install branch

Merged too early.