Merge branch 'refs/heads/t/gui-sigwinch'