Comment 50 for bug 1251590

@Tristan - you are right - my bad. The real patch is coming up.

Both master and grizzly seem to be OK so no need to update those.