Merge branch 'feature-new-window-option'. Closes #39