Merge "Fix Greek accented upper case letters"