Support for SQLAlchemy 0.9
Merge branch 'master' into development