Grabbing the last few loose commits preparing for Week 2 branch.