First merge from FedoraHosted, 18-FEB-14 @ 13:32