add concept-aliases.md
Merge remote-tracking branch 'upstream/master' into upstream

* upstream/master:
  typo fixes [skip ci]