Merge branch 'master' of https://github.com/potatolondon/djangoappengine-1-4
Avoid strange circular import error by checking for join support rather than the type of the connection