Merge branch 'albumblatt'