clarify license and upcoming merge.
version bump
Merge branch 'hotfix/0.25.20.15'