pull fog updates into upstream

Hey, I just noticed that you guys haven't pulled in any of the changes we did when we updated to fog.