Incorporate Jasper's changes from sponsorship2014 branch