CDB-3740 Specs stabilization + small bugfix
Merge branch 'CDB-2959' of https://github.com/CartoDB/cartodb into CDB-2959