Merge from the canonical Github repo