ROGKERN everywhere, including the skel
Merge remote-tracking branch 'upstream/master'