hello2, 4th commit before merge; we'll try to merge master into this (after rebase-into-staging2 has been rebased into master)
Merge branch 'master' into merge-into-staging2
Merge pull request #6 from treble37/merge-into-staging2

Merge into staging2