fixes #1141-loader
Merge branch '1141-loader' of git://github.com/CartoDB/cartodb.js into 1141-loader