Merge branch 'SampleStopFix'
Another commit to play with branching.
Branches grow on Git.
Merge branch 'SampleStopFix'

* SampleStopFix:
  Branches grow on Git.
Branching madness
Where do merges come from?
Merge branch 'master' into SampleStopFix

* master:
  Branching madness
  Another commit to play with branching.
Typo test fix