Update to pull in updated omnibus commits

@sersut