(See http://bugs.sugarlabs.org/ticket/4398) Note that we are currently in Feature Freeze, therefore you should submit a patch, but not a Pull Request when you complete this task.