removal of play_count references
Merge branch 'master' into doorkeeper_upgrade