Don't auto-maximize windows or modify the size to which they unmaximize
Merge remote-tracking branch 'upstream/master'