Merge branches 'master' and 'git_submodule' into git_submodule
Merge branches 'git_submodule' and 'master'