Merge branch 'master' of github.com:CartoDB/cartodb

* 'master' of github.com:CartoDB/cartodb:
  CDB-2719 Not counting now characters for lines bigger than 5k chars
Fixes padding
Merge CDB-2727 into release/2.13.1