Get rid of heavy omni complete - seems to hang on some machines
Merge remote-tracking branch 'upstream/master' into customization

* upstream/master:
  Get rid of heavy omni complete - seems to hang on some machines