Merge "Fix for Bug 295."