Code

Applied patch and updated to address non-BMP Unicode charcters. Fixes bug #369861.