Preparing for rebasing

Preparing for rebasing
Merge branch 'develop' of https://github.com/santthosh/git-demo-receiver into develop

* 'develop' of https://github.com/santthosh/git-demo-receiver:
  Preparing for rebasing