Merge "Fix for Bug 280."