One more weeping leg fix.
Merge remote-tracking branch 'origin/Zargy' into ReleaseBuilds