Merge in stats fix for lp:794717