Merge branch 'mega-5' of ssh://git.gag.com/scm/git/fw/altos into mega-5