Merged from e.pomohaci@gmail.com--2006/muse-epomulet--0 (patch 0-7)