I'd prefer to have a confirmation on the patch from someone who encounters the bug, but -mystery or not- this likely /is/ the source of the issue and (unlike the crash) won't hurt.
So we should just have it in 4.6 and (needs port) master oc.

Compiles, doesn't cause an extra crash ;-)