Merge "Fix for Bug 496."