Merge in upstream development changes.