Yes the patch fixes the problem. I assume you're going to commit this soon and close this bug report.