Merge "Convert CREDITS to single list of contributors"