synchronization with cover_sync branch
Merge branch 'master' into tags-master
synchronization with covers_sync branch
Merge branch 'master' into tags-master