Merge pull request #8464 from daverodgman/license-change-2.28

License change 2.28