Bug 845229 - added custom settings support