Merge pull request #2366 from xmcclure/scripts-babysitter