add a launch day (but pre-launch) branch
Merge branch 'master' into launch-day
fix jim's typo :P