Merges master changes in to harden, keeping harden sorta in sync is good, this is a reminder

Don't actually pull this until conflicts have been worked out.