Merge: rev759 (Removed some more fixtures, and the unneeded csrf disabler.)