Merge pull request #2 from treble37/merge-into-staging2

Merge into staging2
3rd commit before rebase
Merge pull request #3 from treble37/rebase-into-staging1

3rd commit before rebase
Merge pull request #4 from treble37/merge-into-staging2

3rd commit before merge
rebase-into-staging2; but start another feature branch before merging this one
Merge pull request #5 from treble37/rebase-into-staging2

rebase-into-staging2; but start another feature branch before merging th...
Merge branch 'master' into merge-into-staging2