s/GNU Public/GNU General Public/g
Merge remote-tracking branch 'upstream/master'
Another change.