CartoDB/cartodb — pull request #534 by Kartones (2014-06-16 10:41:55+00:00)
Title: Avoid backend termination (v2)

https://github.com/CartoDB/cartodb/pull/273 was outdated and required conflict resolution.

Leaving this PR for when there is time to deep test User changes and merge it.