Merge pull request #4053 from xmcclure/babysitter_cygwin