Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fixing bug that gives wide layout windows the wrong size
Merge pull request #75 from leonardt/wide-layout-patch

Wide layout patch