Merge commit 'karsten/stats-manpage'