fixed #1785 (internal)
Merge branch 'develop' of github.com:CartoDB/cartodb.js into develop