Offer 2013 update

This should be forward ported to 3.2 and master.