Initial commit from patch (bgo#713746)