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