Pull in changes from getting started.