Merge branch 'opds-stats'