This commit brings the repository up to date to match the current master of aurora-sim.  Happy holidays to all