Merge commit 'copiousfreetime/update-script-options'