3877d0f0cc
The three new upstream commits retain their authors in this branch. Regenerated MAP and DEVIATIONS from the combined tree. Previous upstream base:d9c64230, synchronized in779460d8.