DO NOT MERGE - Supporting multibyte puppet modules