fixing a bad merge from master
fixing a bad merge from master

jamoma/JamomaCore,eriser/JamomaCore,eriser/JamomaCore,jamoma/JamomaCore,eriser/JamomaCore,eriser/JamomaCore,eriser/JamomaCore,jamoma/JamomaCore,jamoma/JamomaCore,jamoma/JamomaCore,jamoma/JamomaCore,eriser/JamomaCore,eriser/JamomaCore,jamoma/JamomaCore,eriser/JamomaCore