- Fix document root passing, environment *without* -t, args *with*
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into xpws-c