Merge branch 'master' of git+ssh://maxious.lambdacomplex.org/git/ckanext-dga-stats
Merge branch 'master' of git+ssh://maxious.lambdacomplex.org/git/ckanext-dga-stats

Conflicts:
ckanext/dga_stats/stats.py