CDB-4407 merge master
Merge branch 'CDB-4407' of github.com:CartoDB/cartodb into CDB-4407