Merge branch 'charm' of ejbcharmgit:charm into charm