Remove slightly spurious min height to allow window to actually fit in 1024x600 without cutting off the bottom.
Merge.