Summary of changes: dddbc3d... Fix FTBFS (*) d40eba5... resurrect from F17 into F18 5888945... re-add deleted files (*) This commit already existed in another branch; no separate mail sent