Previously merged by hand, now empty merge commit 'ec59a8834bbca256495045a6687a672f66b52df0' into eclair-mr2