Merge "Don't force lower case in ZenSettings"