Merge "Fix for Bug 351."