Merge pull request #1819 from GawainLynch/release/1.6

Backport cron update from Bolt 2