CDB-1692
Merge branch 'privacy-maps' of https://github.com/CartoDB/cartodb into privacy-maps