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...