Patches from the week

This serves as a repository of the patches we've gone over throughout the week.

[inline-center:skiing.png]
[inline-center:grog.png]