Merge branch 'master' of https://github.com/potatolondon/djangoappengine-1-4