Merge branch 'master' into sanritz
update submodule
Merge branch 'sanritz'