Merge pull request #2311 from Montellese/14097_episode_count