Merge updated license headers and acknowledgements.