Pushing manual merges upstream

Note the only real change is the AUTHORS file; the other two were me having uncommitted changes. Please check the AUTHORS file and specify what bugfixes were contributed