Merge jeffmccune's changes