That was a merge conflict. I closed this and created a new pull req #629