Merge "Update CREDITS file to include new contributors"