Merged in ajaquith/foxslide.