Improved pane options.
Merge branch 'master' into test