Patch 1 to master?

Hopefully this will update master, and not the other way around...