git stash
Merge branch 'master' into datacare

* master:
  git stash