Merge pull request #2 from debanne/master

Fix merge with an already existing Change-Id