merging in the official repo changes