Merge remote-tracking branch 'gfiber-internal/koala' into HEAD

* gfiber-internal/koala:
  :s/master/koala/
tree: da5e5a32110d17f8cfd4326aacafd79f7f52826c
  1. default.xml