Merge branch 'ah/stripspace-optstring' into maint