This includes the uncontroversial portions of #1097 that @zbyszek submitted, leaving out the caret-related changes.
This MAY/SHOULD change was done in an unrelated section instead of the obsoletes section.
Now how did I mess that up? I'll redo things.
Pull-Request has been closed by tibbs
This includes the uncontroversial portions of #1097 that @zbyszek submitted, leaving out the caret-related changes.