Merge pull request #1754 from CircleCI-Public/runwatchfix