stringToArgs no longer takes two arguments
Merge branch 'master' into gh-pages