Merge pull request #2379 from xmcclure/babysitter-contd