First changes to branch
Second changes to branch
Fixing what broken in rebased-merge
Merge pull request #1 from roystgnr/rebase_branch

Pull from rebase branch