CDB-3257 Partially built, at least now doesn't destroys everything
Merge branch 'CDB-2891' of https://github.com/CartoDB/cartodb into CDB-2891