Fix for mac readline.
Options script fix.
forgot to add the test with fix

according to bug report, fix was in 6267f3
Merge remote-tracking branch 'upstream/master' into sets