More on accepting multiple delimiters...
Merge commit '7ab20d0' into cmartinez
In the middle of a change