Merge branch 'charm' of charmgit:/charm into charm