Merge "Fix for Bug 495."