Fix Bug 1101220 - Developer Edition follow-ups