Patch for Bug 1060548

Request to review and merge patch for Bug 1060548.