Merge pull request #298 from milas/marshal-empty-shell-cmd

marshal: correctly handle empty shell commands

Author: glours