Merge branch 'master' into HEAD

* master:
  formd as a module