Merge the official changes back into Kyle's