Merge branch 'master' into tst

* master:
  Initial commit