Let's see how we do with only the main guard.
Merge remote-tracking branch 'upstream/master'