Merge branch 'hpique-master' into feature/affiliate_linking