Argh, fixing merge :-(