Merge branch 'ah/stripspace-optstring'