Merge pull request #710 from TMGMedia/circular-dep-fix