ensure this goofy thing will compile
Merge remote-tracking branch 'origin'