new pr combining older, failed branches
new pr combining older, failed branches

CartoDB/cartodb,CartoDB/cartodb,CartoDB/cartodb,CartoDB/cartodb,splashblot/dronedb,CartoDB/cartodb,splashblot/dronedb,splashblot/dronedb,splashblot/dronedb,splashblot/dronedb