Merge in the 1.3 changes