Merge commit 'edb55982e1c86b99718bb7ccfd4e1d4cd33d5bd0' * commit 'edb55982e1c86b99718bb7ccfd4e1d4cd33d5bd0': Fix Terminal Preferences, Resolution
Merge commit 'edb55982e1c86b99718bb7ccfd4e1d4cd33d5bd0' * commit 'edb55982e1c86b99718bb7ccfd4e1d4cd33d5bd0': Fix Terminal Preferences, Resolution