Somehow forgot to add licenses for Apache 2.0.
Merge remote-tracking branch 'origin/master' into dev

* origin/master:
  Somehow forgot to add licenses for Apache 2.0.