Merge "Update CREDITS"