Merge in vendor branch.