One conflict in a comment that was left unmerged in the previous commit.
One conflict in a comment that was left unmerged in the previous commit.

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