resolved conflicts for merge of cfd7db6d to eclair