Multiple command-line options work again.
Merge branch 'master' into posix_create