possible fix for book duplicates problem
Merge branch 'master' into ice-cream-sandwich