Update submodules
Merge branch 'master' into submoduleupdate
Merge branch 'submoduleupdate'