Merge in lp:504915