Trying again to avoid some SQL queries
Merge branch 'master' of git.defora.org:DaPortal