Fork of the sb-trunk-oldxul Nightingale branch.