Unglamorous changes from my UI rewrite
Merge branch 'master' of ssh://mess.org/mame