Merge in Rails2 support now that its in master