Pulling in upstream changes from rails