Merge branch 'ps/build' into seen

Build procedure update plus introduction of Mason based builds

* ps/build:
  meson: fix conflicts with in-flight topics

Author: gitster