Merge branch 'gui'.