Looks like we need to specify a shell for cron jobs to run this properly
Merge remote-tracking branch 'origin/master'