Update master to reflect testing branch

Nothing important to see here.