Commit 1 from feature.
Commit 3 from feature.
Merge pull request #1 from m-lawson/feature

Pull request