Merge branch 'master' into 28_git_support
handle deleted files
Merge branch '28_git_support'