synchronization with cover_sync branch
Merge branch 'master' into nook
synchronization with covers_sync branch
Merge branch 'master' into nook