CDB-1832 small encapsulation of checks in a method
Merge branch 'privacy-maps' of https://github.com/CartoDB/cartodb into privacy-maps