Merge "Fix for Bug 586."