Old style, avoid merge conflicts, missing history
Old style, avoid merge conflicts, missing history

CartoDB/Windshaft-cartodb,CartoDB/Windshaft-cartodb,manueltimita/Windshaft-cartodb,UCL-ShippingGroup/Windshaft-cartodb,manueltimita/Windshaft-cartodb,CartoDB/Windshaft-cartodb,CartoDB/Windshaft-cartodb,manueltimita/Windshaft-cartodb,UCL-ShippingGroup/Windshaft-cartodb,UCL-ShippingGroup/Windshaft-cartodb