Merge in bug fix for lp:779837