Afw test harness 2.1
Merge "Avoid shifts of negative values inflateMark()."