Cleanly syncs harden with master

Helps stop harden from falling far behind, like what normally happens with branches.