Comment 16 for bug 2012669

All,

As per Mike's request, I've squashed it down to a single commit. I had the same thoughts but I think I was trying to hang onto the git blame for each of us. I realize that there's a way to push all of one authors commits into a single and the other authors commits into a single, but I'm pretty sure there would be an issue doing that because one commit relied on the other. That's alright, we can blame Llewellyn for the whole patch!

Force pushed.