CDB-2891 Fix: critical error in User callback
Merge branch 'CDB-2891' of github.com:CartoDB/cartodb into CDB-2891