Merge branch 'jk/submodules' into pu

* branch jk/submodules:
  Add submodule support