r16927: back merge of a packaging fix for release numbers (from 3.0.23)