Updates from SaberMod

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>
Merge remote-tracking branch 'uber/uber' into uber