manual "merge" between this branch and master to sync the two more cleanly.