New, less controlling, license.
Merge remote-tracking branch 'origin/master'