Just committing to get things up to date.
More changes in sqlalchemy branch.