merging remote tracking branch as well
Merge branch 'master' into GithubDeleteBranchFeature