cleanup (from covers_sync branch)
Merge branch 'master' into ice-cream-sandwich