Merge branch 'master' into subproject_remote
more fixes
Merge branch 'subproject_remote'