Merge remote-tracking branch 'origin/master' into beta
Merge remote-tracking branch 'origin/master' into beta
imports patch for issue #137 (compile does not work with files in subdirectories) -- see https://github.com/thehogfather/pvsio-web/commit/373e49960618215a6099854bc978bd7fd17126a0
Merge remote-tracking branch 'origin/master' into beta
Merge branch 'beta' into alpha

* beta:
  imports patch for issue #137 (compile does not work with files in subdirectories) -- see https://github.com/thehogfather/pvsio-web/commit/373e49960618215a6099854bc978bd7fd17126a0
comment updates