cherry-picked from the master branch by adamhl

This is the (old) master branch along with the fixes to the
cron file permissions that Russ made.