Bug 880420 - Follow up fix and version bump