New File::TypeCategories config
Merge remote-tracking branch 'origin/master' into optus

* origin/master:
  New File::TypeCategories config
Optus config