Comment 3 for bug 1413624

I've run it through its pace and looks good to me, so I've pushed it to master, along with a minor tweak of the documentation to reflect the change allowing space-delimited option lists.

Thanks, Thomas!