Fix merge error from a while ago
Merge branch 'edinburgh-sale'