Trying to fix weird issues.
Merge branch 'release-2.0' of https://github.com/dchbx/gluedb into release-2.0