forwarded 202840 Tomasz Koczko <kloczek@pld.org.pl> forwarded 287108 Tomasz Koczko <kloczek@pld.org.pl> merge 202840 287108 thanks Redoing the merge because it was rejected for a minor inconsistency (we bloody need some artificial intelligence in that BTS...:-))).