Cleaned up auto complete
Cleaned up auto complete further
Merge remote-tracking branch 'origin/master' into optus

* origin/master:
  Cleaned up auto complete further
  Cleaned up auto complete