fixed CDB-991
Merge branch 'release/2.5.0' of github.com:CartoDB/cartodb into release/2.5.0