Comment 3 for bug 1406350

I have tested this code and consent to signing off on it with my name, Yamil Suarez aka yboston and email address, <email address hidden>

NOTE: It looks like that the commit can cause a merge conflict with master. I noticed this because I was going to signoff this commit, but I need to resolve the conflict. I rather give someone a chance to handle the conflict resolution and committing faster than I could.