Updating: LGPLv2.1 -> GPLv3
Merge remote-tracking branch 'upstream/master'
removes some undesirable comments