Update LICENSE file, with new fsf address
cp /usr/share/common-licenses/GPL-2 LICENSE
Merge remote-tracking branch 'upstream/master'